From: Glenn Morris <rgm@gnu.org>
Date: Tue, 20 Nov 2018 17:38:43 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~4519
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=336681f35bf23f442a7159eb86d1c5d8a6269c7f;p=emacs.git

Merge from origin/emacs-26

d667318 (origin/emacs-26) Fix two Edebug defcustoms (bug#33428)
---

336681f35bf23f442a7159eb86d1c5d8a6269c7f